From 01911b5ecd96e726335a7a18e27030a2304671b0 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Mon, 18 Sep 2017 23:49:44 -0300 Subject: [PATCH] wayland: Bump GTK_SHELL1 version to 2 Otherwise, we can't negotiate the latest version with the compositor, making the compositor use v1 of the protocol and pretty much ignoring all the edge constraints work. --- gdk/wayland/gdkdisplay-wayland.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 8f8c1ddc9a..30f4d4308a 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -85,6 +85,8 @@ #define MIN_SYSTEM_BELL_DELAY_MS 20 +#define GTK_SHELL1_VERSION 2 + static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland); G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY) @@ -374,7 +376,7 @@ gdk_registry_handle_global (void *data, display_wayland->gtk_shell = wl_registry_bind(display_wayland->wl_registry, id, >k_shell1_interface, - 1); + GTK_SHELL1_VERSION); _gdk_wayland_screen_set_has_gtk_shell (display_wayland->screen); display_wayland->gtk_shell_version = version; } -- 2.30.2